| commit | 61169124a250790e1310b11635d25e7e25253f9b | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junio@hera.kernel.org> | Mon Feb 09 18:05:49 2009 |
| committer | Junio C Hamano <junio@hera.kernel.org> | Mon Feb 09 18:05:49 2009 |
| tree | 193c1f55de9eafcad5daf9153869efa90975b59a | |
| parent | e5bf6c1297898d9fd6102bdf7e5cc637b1bbdbb8 [diff] [blame] |
Autogenerated HTML docs for v1.6.2-rc0-10-gf6b9
diff --git a/gitk.txt b/gitk.txt index 4673a75..bd005bc 100644 --- a/gitk.txt +++ b/gitk.txt
@@ -47,7 +47,8 @@ After an attempt to merge stops with conflicts, show the commits on the history between two branches (i.e. the HEAD and the MERGE_HEAD) - that modify the conflicted files. + that modify the conflicted files and do not exist on all the heads + being merged. --argscmd=<command>:: Command to be run each time gitk has to determine the list of